Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 23 Apr 2010 22:30:27 +0000 (22:30 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 23 Apr 2010 22:30:27 +0000 (22:30 +0000)

Trivial merge